From: Jasper St. Pierre Date: Fri, 23 Aug 2013 16:34:38 +0000 (-0400) Subject: src: Eliminate compiler warnings X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3633 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d3a88e59b91ebd6a3807908618ad6202ba2329cb;p=gnome-shell.git src: Eliminate compiler warnings --- diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c index 04b1d5b41..31e7f85c2 100644 --- a/src/shell-app-usage.c +++ b/src/shell-app-usage.c @@ -419,14 +419,13 @@ shell_app_usage_init (ShellAppUsage *self) self->currently_idle = FALSE; self->enable_monitoring = FALSE; - g_object_get (shell_global_get(), "userdatadir", &shell_userdata_dir, NULL), + g_object_get (global, "userdatadir", &shell_userdata_dir, NULL), path = g_build_filename (shell_userdata_dir, DATA_FILENAME, NULL); g_free (shell_userdata_dir); self->configfile = g_file_new_for_path (path); g_free (path); restore_from_file (self); - self->privacy_settings = g_settings_new(PRIVACY_SCHEMA); g_signal_connect (self->privacy_settings, "changed::" ENABLE_MONITORING_KEY, diff --git a/src/shell-global.c b/src/shell-global.c index 83f8c464d..0ea3287b3 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -1018,8 +1018,6 @@ void shell_global_end_modal (ShellGlobal *global, guint32 timestamp) { - ClutterActor *actor; - if (!global->has_modal) return; diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c index b686893c5..ed9d9b43c 100644 --- a/src/shell-window-tracker.c +++ b/src/shell-window-tracker.c @@ -191,10 +191,8 @@ get_app_from_window_wmclass (MetaWindow *window) { ShellApp *app; ShellAppSystem *appsys; - char *appid; const char *wm_class; const char *wm_instance; - char *with_desktop; appsys = shell_app_system_get_default (); @@ -372,12 +370,9 @@ static ShellApp * get_app_for_window (ShellWindowTracker *tracker, MetaWindow *window) { - ShellAppSystem *app_system; ShellApp *result = NULL; const char *startup_id; - app_system = shell_app_system_get_default (); - /* First, we check whether we already know about this window, * if so, just return that. */